bitkeeper revision 1.23 (3e3c0371lW0pQGn9j_7hdF_Skyc2Sg)

Half way merge with Boris recent dom creation checkin (demonstrating my inability
to control BK tools)

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/logging_ok
index 2fd8b201d7ed578ae7a7a777a56b8d4cb2316680,af6fb70b2af0a7df1c8897499c1e62f75e74c8be..cca59e5d2c468cad4011cd7ce260fcb90fe5fdbc
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -5,6 -3,6 +5,7 @@@ iap10@labyrinth.cl.cam.ac.u
  kaf24@labyrinth.cl.cam.ac.uk
  kaf24@plym.cl.cam.ac.uk
  kaf24@striker.cl.cam.ac.uk
 +lynx@idefix.cl.cam.ac.uk
+ rn@wyvis.camb.intel-research.net
  smh22@boulderdash.cl.cam.ac.uk
  smh22@uridium.cl.cam.ac.uk

diff --cc xen-2.4.16/arch/i386/setup.c
Simple merge

diff --cc xen-2.4.16/common/domain.c
index 96088948329ffc6e22b320b3c1792c024be6040e,7e95845ad10ea947638760baf5b55b9494c89b60..19a2f8119b1b9272b5221b17fcbfa0c3f2e632c0
--- 1/xen-2.4.16/common/domain.c
--- 2/xen-2.4.16/common/domain.c
+++ b/xen-2.4.16/common/domain.c
@@@ -813,14 -486,22 +636,15 @@@ int setup_guestos(struct task_struct *p
      return 0;
  }
  
+ 
  void __init domain_init(void)
  {
-     int i;
-     for ( i = 0; i < NR_CPUS; i++ )
-     {
-         INIT_LIST_HEAD(&schedule_data[i].runqueue);
-         spin_lock_init(&schedule_data[i].lock);
-         schedule_data[i].prev = &idle0_task;
-         schedule_data[i].curr = &idle0_task;
+       printk("Initialising domains\n");
+ //    scheduler_init();
+ }
+ 
+ 
+ 
+ #if 0
 -    unsigned long s = (mod[        0].mod_start + (PAGE_SIZE-1)) & PAGE_MASK;
 -    unsigned long e = (mod[nr_mods-1].mod_end   + (PAGE_SIZE-1)) & PAGE_MASK;
 -    while ( s != e ) 
 -    { 
 -        free_pages((unsigned long)__va(s), 0); 
 -        s += PAGE_SIZE;
      }
 -#endif
 -
 +}

diff --cc xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
Simple merge

diff --cc xen-2.4.16/include/xeno/sched.h
index 7afc6d9e1d9de70ca139f0981dbbd1b4bf7f6864,02cf6fa5e1c446cf7e2d78ece88b08507ebfdce0..d0fdab4948f388365ed9621e5ee7c27a1f9a2a03
--- 1/xen-2.4.16/include/xeno/sched.h
--- 2/xen-2.4.16/include/xeno/sched.h
+++ b/xen-2.4.16/include/xeno/sched.h
@@@ -58,19 -41,11 +58,20 @@@ extern struct mm_struct init_mm
  #include <xeno/block.h>
  
  struct task_struct {
 +
      int processor;
-     int state, hyp_events;
+     int state;
+       int hyp_events;
      unsigned int domain;
  
 +    /* index into frame_table threading pages belonging to this
 +     * domain together. these are placed at the top of the structure
 +     * to avoid nasty padding for various kernel structs when using
 +     * task_struct in user space
 +     */
 +    unsigned long pg_head;
 +    unsigned int tot_pages;
 +
      /* An unsafe pointer into a shared data area. */
      shared_info_t *shared_info;
      

diff --cc xenolinux-2.4.16-sparse/arch/xeno/kernel/process.c
Simple merge

diff --cc xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor.h
Simple merge